merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:01 +0000 (12:35 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 26 Dec 2011 03:35:01 +0000 (12:35 +0900)
commita345da726cb82fb8b8133cd0c43183e3680ea92e
treeebe9bbd8e6b59b8867b7cf77eb81cc67155dc324
parent3343f481d458bdddcf36acb8c8ec0ec6cef0ec16
parent25eca15953da97e0bd04d29a11a1008ba8637264
merge trunk